Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2011 23:35:10 +0000 (16:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 5 Aug 2011 23:35:10 +0000 (16:35 -0700)
commit04ebb7b206fe110efe474d2069de93ee77388acc
tree18813eccaa81d1f24fb9c55a18d332c3db8eacf3
parent999b5ecfddc7b442a23d8618195b67303b33d141
parentd75d3f973a449fcc092c0310a7ad257082b151d4
Merge from trunk.
src/ChangeLog
src/bidi.c
src/dispextern.h
src/dispnew.c
src/indent.c
src/window.c
src/xdisp.c